bitkeeper revision 1.1159.258.135 (428a3218LRhrEVrFCYcKckXl2ziRCQ)

Backport of network script fix from unstable.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/examples/network b/tools/examples/network
index 12ff1c5eee0284a7e5ac5abe28afda3f9676eaf0..891a82d71eaaea06020e42e44bc7f6c9b19bf358 100755 (executable)
--- a/tools/examples/network
+++ b/tools/examples/network
@@ -164,6 +164,10 @@ op_start () {
 
     create_bridge ${bridge}
 
+    if ifconfig 2>/dev/null | grep -q veth0 ; then
+        return
+    fi
+
     if ifconfig veth0 2>/dev/null | grep -q veth0 ; then
         # Propagate MAC address and ARP responsibilities to virtual interface.
         mac=`ifconfig ${netdev} | grep HWadd | sed -e 's/.*\(..:..:..:..:..:..\).*/\1/'`